Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 4 Jul 2011 17:41:05 +0000 (10:41 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 4 Jul 2011 17:41:05 +0000 (10:41 -0700)

Trivial merge